No point in making the error path fast by caching quarks.

2006-04-03  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkrecentchooser.c (gtk_recent_chooser_error_quark):
        * gtk/gtkrecentmanager.c (gtk_recent_manager_error_quark):
        * gtk/gtkfilechooser.c (gtk_file_chooser_error_quark):
        * gtk/gtkfilesystem.c (gtk_file_system_error_quark):
        * gtk/gtkicontheme.c (gtk_icon_theme_error_quark): No point
        in making the error path fast by caching quarks.

diff --git a/ChangeLog b/ChangeLog
index 6c0b79ea68a07cbdd874c5ccb5a1d41a0e998e70..e4392254c655024543306af10a45c4bbc153391b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2006-04-03  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkrecentchooser.c (gtk_recent_chooser_error_quark):
+       * gtk/gtkrecentmanager.c (gtk_recent_manager_error_quark):
+       * gtk/gtkfilechooser.c (gtk_file_chooser_error_quark):
+       * gtk/gtkfilesystem.c (gtk_file_system_error_quark):
+       * gtk/gtkicontheme.c (gtk_icon_theme_error_quark): No point
+       in making the error path fast by caching quarks. 
+
        * gtk/gtkfilesel.c (no_stat_dirs): Avoid relocation.
 
        * gdk/gdk.c: Here too.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6c0b79ea68a07cbdd874c5ccb5a1d41a0e998e70..e4392254c655024543306af10a45c4bbc153391b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,12 @@
 2006-04-03  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkrecentchooser.c (gtk_recent_chooser_error_quark):
+       * gtk/gtkrecentmanager.c (gtk_recent_manager_error_quark):
+       * gtk/gtkfilechooser.c (gtk_file_chooser_error_quark):
+       * gtk/gtkfilesystem.c (gtk_file_system_error_quark):
+       * gtk/gtkicontheme.c (gtk_icon_theme_error_quark): No point
+       in making the error path fast by caching quarks. 
+
        * gtk/gtkfilesel.c (no_stat_dirs): Avoid relocation.
 
        * gdk/gdk.c: Here too.

diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c
index 0a138675d1dea0b0879cc9d8521b72901d45e196..3f9b943f802c152ae0ed3a26c56e1b745634d2e5 100644 (file)
--- a/gtk/gtkfilechooser.c
+++ b/gtk/gtkfilechooser.c
@@ -292,10 +292,7 @@ gtk_file_chooser_class_init (gpointer g_iface)
 GQuark
 gtk_file_chooser_error_quark (void)
 {
-  static GQuark quark = 0;
-  if (quark == 0)
-    quark = g_quark_from_static_string ("gtk-file-chooser-error-quark");
-  return quark;
+  return g_quark_from_static_string ("gtk-file-chooser-error-quark");
 }
 
 /**

diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c
index 9158d6dba2a8eccbc17a270e1530067f3f5d6a63..4ccc1cac15577e45a7186fc2671f9f8b28f70373 100644 (file)
--- a/gtk/gtkfilesystem.c
+++ b/gtk/gtkfilesystem.c
@@ -45,10 +45,7 @@ static void gtk_file_folder_base_init (gpointer g_class);
 GQuark
 gtk_file_system_error_quark (void)
 {
-  static GQuark quark = 0;
-  if (quark == 0)
-    quark = g_quark_from_static_string ("gtk-file-system-error-quark");
-  return quark;
+  return g_quark_from_static_string ("gtk-file-system-error-quark");
 }
 
 /*****************************************

diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 1be4d3660cb7c768b7d8d2dc2b9f96b0dc2ccc21..19b83f6c6a1fe072dd8d9b8fa8d7b21d9c95677a 100644 (file)
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -1342,11 +1342,7 @@ gtk_icon_theme_lookup_icon (GtkIconTheme       *icon_theme,
 GQuark
 gtk_icon_theme_error_quark (void)
 {
-  static GQuark q = 0;
-  if (q == 0)
-    q = g_quark_from_static_string ("gtk-icon-theme-error-quark");
-
-  return q;
+  return g_quark_from_static_string ("gtk-icon-theme-error-quark");
 }
 
 /**

diff --git a/gtk/gtkrecentchooser.c b/gtk/gtkrecentchooser.c
index da7a192abb8e2745a408cb1bf6b5bce8e3d5c117..721d04d6a9950cbbd77f07567d896ea70a31a685 100644 (file)
--- a/gtk/gtkrecentchooser.c
+++ b/gtk/gtkrecentchooser.c
@@ -181,10 +181,7 @@ gtk_recent_chooser_class_init (gpointer g_iface)
 GQuark
 gtk_recent_chooser_error_quark (void)
 {
-  static GQuark error_quark = 0;
-  if (!error_quark)
-    error_quark = g_quark_from_static_string ("gtk-recent-chooser-error-quark");
-  return error_quark;
+  return g_quark_from_static_string ("gtk-recent-chooser-error-quark");
 }
 
 /**

diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c
index cebcee9d5be8e7950c98247856ed4b89afe3dbdd..62b6482513b3a1e2a12b96f01189e69df5410c67 100644 (file)
--- a/gtk/gtkrecentmanager.c
+++ b/gtk/gtkrecentmanager.c
@@ -163,10 +163,7 @@ filename_warning (const char *format, const char *filename, const char *message)
 GQuark
 gtk_recent_manager_error_quark (void)
 {
-  static GQuark quark = 0;
-  if (quark == 0)
-    quark = g_quark_from_static_string ("gtk-recent-manager-error-quark");
-  return quark;
+  return g_quark_from_static_string ("gtk-recent-manager-error-quark");
 }